From 2ea98da21fcb9943f1a3b00e1818185b8f810419 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 9 Jul 2020 20:59:02 +0200 Subject: [PATCH] rebase patches --- debian/patches/0006-Use-system-zlib.patch | 1164 +++++++++-------- debian/patches/0007-Use-system-shapelib.patch | 110 +- ...08-Use-usb.h-from-system-include-dir.patch | 35 - .../0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch | 42 - ...-Drop-mac-libusb-libusb.h-dependency.patch | 21 + debian/patches/0010-Fix-manpage-xml.patch | 21 - .../0011-Fix-exec-in-gpsbabel.desktop.patch | 20 - ...-gps-every-10th-ride-or-so-outputs-a.patch | 23 - ...e-strncmp-to-compare-array-to-string.patch | 27 - debian/patches/cross.patch | 2 +- .../gpsbabelfe_do-not-check-for-newer-version | 8 +- debian/patches/htmldoc-location | 47 +- debian/patches/series | 7 +- 13 files changed, 748 insertions(+), 779 deletions(-) delete mode 100644 debian/patches/0008-Use-usb.h-from-system-include-dir.patch delete mode 100644 debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch create mode 100644 debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch delete mode 100644 debian/patches/0010-Fix-manpage-xml.patch delete mode 100644 debian/patches/0011-Fix-exec-in-gpsbabel.desktop.patch delete mode 100644 debian/patches/0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch delete mode 100644 debian/patches/0014-Use-strncmp-to-compare-array-to-string.patch diff --git a/debian/patches/0006-Use-system-zlib.patch b/debian/patches/0006-Use-system-zlib.patch index 342ef9ac5..3f52da784 100644 --- a/debian/patches/0006-Use-system-zlib.patch +++ b/debian/patches/0006-Use-system-zlib.patch @@ -3,14 +3,23 @@ Date: Thu, 30 May 2019 12:09:43 +0200 Subject: Use system zlib --- - Makefile.in | 403 +++++++++++++++++++++++++++--------------------------------- - 1 file changed, 182 insertions(+), 221 deletions(-) + Makefile.in | 404 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 185 insertions(+), 219 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 6f21943..eb0f120 100644 +index 5ace8da..be6f7d0 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -107,12 +107,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ +@@ -55,7 +55,7 @@ LRELEASE=@LRELEASE@ + # + #OPTIMIZATION=-O $(EXTRA_OPTIMIZATION) + #DEBUGGING=-g $(EXTRA_DEBUGGING) +-GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) $(BUILD_CPP) @ZLIB_CPP@ @QT_INC_OPT@$(QT_INC) \ ++GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) $(BUILD_CPP) @QT_INC_OPT@$(QT_INC) \ + $(OPTIMIZATION) -DHAVE_CONFIG_H + LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@ + PREFIX=@prefix@ +@@ -106,12 +106,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o @@ -23,7 +32,7 @@ index 6f21943..eb0f120 100644 LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \ -@@ -121,7 +115,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ +@@ -120,7 +114,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ src/core/textstream.o \ src/core/usasciicodec.o \ src/core/xmlstreamwriter.o \ @@ -32,417 +41,440 @@ index 6f21943..eb0f120 100644 OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ DEPFILES = $(OBJS:.o=.d) -@@ -422,115 +416,115 @@ toolinfo: - -$(QMAKE) -v +@@ -424,86 +418,86 @@ mac/libusb/libusb-1.0.a: + cd mac/libusb; $(QMAKE) @abs_srcdir@/mac/libusb/libusb.pro && $(MAKE) # Machine generated from here down. --alan.o: alan.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+alan.o: alan.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h --an1.o: an1.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+an1.o: an1.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h an1sym.h --arcdist.o: arcdist.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+arcdist.o: arcdist.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - arcdist.h filter.h filterdefs.h grtcirc.h --bcr.o: bcr.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+bcr.o: bcr.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h csv_util.h \ - garmin_tables.h --bend.o: bend.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+bend.o: bend.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h bend.h grtcirc.h +-alan.o: alan.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++alan.o: alan.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-an1.o: an1.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++an1.o: an1.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + an1sym.h +-arcdist.o: arcdist.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++arcdist.o: arcdist.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + arcdist.h filter.h grtcirc.h src/core/logging.h +-bcr.o: bcr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++bcr.o: bcr.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h garmin_tables.h +-bend.o: bend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++bend.o: bend.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + bend.h filter.h grtcirc.h -brauniger_iq.o: brauniger_iq.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +brauniger_iq.o: brauniger_iq.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h gbser.h --bushnell.o: bushnell.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+bushnell.o: bushnell.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-bushnell.o: bushnell.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++bushnell.o: bushnell.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h -bushnell_trl.o: bushnell_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +bushnell_trl.o: bushnell_trl.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h --cet.o: cet.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+cet.o: cet.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h --cet_util.o: cet_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+cet_util.o: cet_util.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h src/core/logging.h cet/ansi_x3_4_1968.h cet/cp1252.h \ - cet/iso_8859_8.h --compegps.o: compegps.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+compegps.o: compegps.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h csv_util.h jeeps/gpsmath.h jeeps/gpsport.h --cst.o: cst.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+cst.o: cst.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h --csv_util.o: csv_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+csv_util.o: csv_util.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - csv_util.h src/core/logging.h --delgpl.o: delgpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+delgpl.o: delgpl.cc defs.h config.h cet.h \ +-cet.o: cet.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++cet.o: cet.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet.h +-cet_util.o: cet_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++cet_util.o: cet_util.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h cet_util.h src/core/logging.h +-compegps.o: compegps.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++compegps.o: compegps.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h cet_util.h csv_util.h jeeps/gpsmath.h \ + jeeps/gpsport.h +-cst.o: cst.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++cst.o: cst.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h +-csv_util.o: csv_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++csv_util.o: csv_util.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h src/core/logging.h +-delgpl.o: delgpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++delgpl.o: delgpl.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h -destinator.o: destinator.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +destinator.o: destinator.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ strptime.h --dg-100.o: dg-100.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+dg-100.o: dg-100.cc defs.h config.h cet.h \ +-dg-100.o: dg-100.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++dg-100.o: dg-100.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - gbser.h --discard.o: discard.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+discard.o: discard.cc defs.h config.h cet.h \ + dg-100.h format.h gbser.h +-discard.o: discard.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++discard.o: discard.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - discard.h filter.h filterdefs.h --dmtlog.o: dmtlog.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+dmtlog.o: dmtlog.cc defs.h config.h cet.h \ + discard.h filter.h +-dmtlog.o: dmtlog.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++dmtlog.o: dmtlog.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h --duplicate.o: duplicate.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+duplicate.o: duplicate.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h duplicate.h --easygps.o: easygps.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+easygps.o: easygps.cc defs.h config.h cet.h \ +-duplicate.o: duplicate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++duplicate.o: duplicate.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h duplicate.h filter.h +-easygps.o: easygps.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++easygps.o: easygps.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h -energympro.o: energympro.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +energympro.o: energympro.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h --enigma.o: enigma.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+enigma.o: enigma.cc defs.h config.h cet.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h energympro.h format.h +-enigma.o: enigma.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++enigma.o: enigma.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --exif.o: exif.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+exif.o: exif.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-exif.o: exif.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++exif.o: exif.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h -explorist_ini.o: explorist_ini.cc defs.h config.h zlib/zlib.h \ -- zlib/zconf.h cet.h inifile.h gbfile.h session.h src/core/datetime.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ +explorist_ini.o: explorist_ini.cc defs.h config.h \ -+ cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h explorist_ini.h ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h explorist_ini.h -f90g_track.o: f90g_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +f90g_track.o: f90g_track.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h --fatal.o: fatal.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+fatal.o: fatal.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-fatal.o: fatal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++fatal.o: fatal.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/logging.h -filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +filter_vecs.o: filter_vecs.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h arcdist.h filter.h bend.h discard.h duplicate.h \ - filterdefs.h height.h interpolate.h nukedata.h polygon.h position.h \ - radius.h reverse_route.h smplrout.h sort.h stackfilter.h swapdata.h \ - trackfilter.h transform.h validate.h gbversion.h --formspec.o: formspec.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+formspec.o: formspec.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --g7towin.o: g7towin.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+g7towin.o: g7towin.cc defs.h config.h cet.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h filter_vecs.h arcdist.h filter.h bend.h discard.h \ + duplicate.h height.h heightgrid.h interpolate.h nukedata.h polygon.h \ +@@ -518,17 +512,17 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h +-formspec.o: formspec.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++formspec.o: formspec.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-g7towin.o: g7towin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++g7towin.o: g7towin.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet_util.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ garmin_tables.h strptime.h --garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+garmin.o: garmin.cc defs.h config.h cet.h \ +-garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++garmin.o: garmin.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h garmin_device_xml.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ - jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ - jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - garmin_tables.h grtcirc.h jeeps/gpsserial.h + cet_util.h format.h garmin_device_xml.h garmin_fs.h jeeps/gps.h \ + jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ +@@ -540,101 +534,101 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ + qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h yahoo.h -garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \ -- zlib/zconf.h cet.h inifile.h gbfile.h session.h src/core/datetime.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ +garmin_device_xml.o: garmin_device_xml.cc defs.h config.h \ -+ cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h garmin_device_xml.h xmlgeneric.h ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h garmin_device_xml.h \ + xmlgeneric.h -garmin_fit.o: garmin_fit.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +garmin_fit.o: garmin_fit.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h --garmin_fs.o: garmin_fs.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+garmin_fs.o: garmin_fs.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ - jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ - jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_fit.h format.h jeeps/gpsmath.h \ + jeeps/gpsport.h src/core/logging.h +-garmin_fs.o: garmin_fs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_fs.o: garmin_fs.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h -garmin_gpi.o: garmin_gpi.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +garmin_gpi.o: garmin_gpi.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h garmin_gpi.h cet_util.h garmin_fs.h jeeps/gps.h \ jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ -@@ -538,246 +532,246 @@ garmin_gpi.o: garmin_gpi.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h - garmin_tables.o: garmin_tables.cc garmin_tables.h defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h session.h \ -+ cet.h inifile.h gbfile.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsmath.h \ - jeeps/gpsport.h src/core/logging.h +-garmin_tables.o: garmin_tables.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++garmin_tables.o: garmin_tables.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h garmin_tables.h \ + jeeps/gpsmath.h jeeps/gpsport.h src/core/logging.h \ + garmin_icon_tables.h -garmin_txt.o: garmin_txt.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +garmin_txt.o: garmin_txt.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h cet_util.h csv_util.h garmin_fs.h jeeps/gps.h \ - jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ - jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ - jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h garmin_tables.h grtcirc.h strptime.h --garmin_xt.o: garmin_xt.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+garmin_xt.o: garmin_xt.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --gbfile.o: gbfile.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gbfile.o: gbfile.cc defs.h config.h cet.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h src/core/textstream.h src/core/file.h strptime.h +-garmin_xt.o: garmin_xt.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++garmin_xt.o: garmin_xt.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-gbfile.o: gbfile.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gbfile.o: gbfile.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - src/core/logging.h --gbser.o: gbser.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gbser.o: gbser.cc defs.h config.h cet.h \ + src/core/logging.h cet.h +-gbser.o: gbser.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gbser.o: gbser.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ gbser.h gbser_private.h -gbser_posix.o: gbser_posix.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +gbser_posix.o: gbser_posix.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h gbser.h gbser_private.h --gdb.o: gdb.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+gdb.o: gdb.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h \ - garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ +-gdb.o: gdb.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gdb.o: gdb.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \ grtcirc.h --geo.o: geo.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+geo.o: geo.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ - src/core/file.h --geojson.o: geojson.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+geojson.o: geojson.cc defs.h config.h cet.h \ +-geo.o: geo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++geo.o: geo.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ src/core/file.h --ggv_bin.o: ggv_bin.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+ggv_bin.o: ggv_bin.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --ggv_log.o: ggv_log.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+ggv_log.o: ggv_log.cc defs.h config.h cet.h \ +-geojson.o: geojson.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++geojson.o: geojson.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + geojson.h format.h src/core/file.h src/core/logging.h +-ggv_bin.o: ggv_bin.cc ggv_bin.h defs.h config.h zlib/zlib.h zlib/zconf.h \ ++ggv_bin.o: ggv_bin.cc ggv_bin.h defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h format.h +-ggv_log.o: ggv_log.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ggv_log.o: ggv_log.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ grtcirc.h --ggv_ovl.o: ggv_ovl.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+ggv_ovl.o: ggv_ovl.cc defs.h config.h cet.h \ +-ggv_ovl.o: ggv_ovl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ggv_ovl.o: ggv_ovl.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ grtcirc.h --globals.o: globals.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+globals.o: globals.cc defs.h config.h cet.h \ +-globals.o: globals.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++globals.o: globals.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ gbversion.h -globalsat_sport.o: globalsat_sport.cc defs.h config.h zlib/zlib.h \ -- zlib/zconf.h cet.h inifile.h gbfile.h session.h src/core/datetime.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ +globalsat_sport.o: globalsat_sport.cc defs.h config.h \ -+ cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h gbser.h --glogbook.o: glogbook.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+glogbook.o: glogbook.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - src/core/file.h xmlgeneric.h --gnav_trl.o: gnav_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gnav_trl.o: gnav_trl.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --googledir.o: googledir.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+googledir.o: googledir.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - xmlgeneric.h --gopal.o: gopal.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gopal.o: gopal.cc defs.h config.h cet.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h globalsat_sport.h format.h \ + gbser.h +-glogbook.o: glogbook.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++glogbook.o: glogbook.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h src/core/file.h xmlgeneric.h +-gnav_trl.o: gnav_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++gnav_trl.o: gnav_trl.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-googledir.o: googledir.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++googledir.o: googledir.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h +-gopal.o: gopal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gopal.o: gopal.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet_util.h csv_util.h grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h \ strptime.h --gpssim.o: gpssim.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gpssim.o: gpssim.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --gpsutil.o: gpsutil.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gpsutil.o: gpsutil.cc defs.h config.h cet.h \ +-gpssim.o: gpssim.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gpssim.o: gpssim.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + nmea.h format.h +-gpsutil.o: gpsutil.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gpsutil.o: gpsutil.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet_util.h magellan.h --gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+gpx.o: gpx.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h garmin_fs.h \ - jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h \ - jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ - jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ - jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h src/core/file.h \ - src/core/logging.h src/core/xmlstreamwriter.h src/core/xmltag.h --grtcirc.o: grtcirc.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+grtcirc.o: grtcirc.cc defs.h config.h cet.h \ +-gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gpx.o: gpx.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + gpx.h format.h src/core/file.h src/core/xmlstreamwriter.h \ + src/core/xmltag.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ +@@ -642,88 +636,88 @@ gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ + garmin_tables.h src/core/logging.h +-grtcirc.o: grtcirc.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++grtcirc.o: grtcirc.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ grtcirc.h --gtm.o: gtm.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+gtm.o: gtm.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-gtm.o: gtm.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gtm.o: gtm.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h --gtrnctr.o: gtrnctr.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+gtrnctr.o: gtrnctr.cc defs.h config.h cet.h \ +-gtrnctr.o: gtrnctr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++gtrnctr.o: gtrnctr.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ xmlgeneric.h --height.o: height.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+height.o: height.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h height.h heightgrid.h --hiketech.o: hiketech.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+hiketech.o: hiketech.cc defs.h config.h cet.h \ +-height.o: height.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++height.o: height.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - src/core/xmlstreamwriter.h xmlgeneric.h --holux.o: holux.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+holux.o: holux.cc defs.h config.h cet.h \ + height.h filter.h heightgrid.h +-hiketech.o: hiketech.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++hiketech.o: hiketech.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h src/core/xmlstreamwriter.h xmlgeneric.h +-holux.o: holux.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++holux.o: holux.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ holux.h --html.o: html.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+html.o: html.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-html.o: html.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++html.o: html.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h -humminbird.o: humminbird.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +humminbird.o: humminbird.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h --igc.o: igc.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+igc.o: igc.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h --ignrando.o: ignrando.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+ignrando.o: ignrando.cc defs.h config.h cet.h \ +-igc.o: igc.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++igc.o: igc.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h +-ignrando.o: ignrando.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++ignrando.o: ignrando.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h +-igo8.o: igo8.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++igo8.o: igo8.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-ik3d.o: ik3d.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ik3d.o: ik3d.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ xmlgeneric.h --igo8.o: igo8.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+igo8.o: igo8.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h --ik3d.o: ik3d.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+ik3d.o: ik3d.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ - xmlgeneric.h --inifile.o: inifile.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+inifile.o: inifile.cc defs.h config.h cet.h \ +-inifile.o: inifile.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++inifile.o: inifile.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ src/core/file.h -internal_styles.o: internal_styles.cc defs.h config.h zlib/zlib.h \ -- zlib/zconf.h cet.h inifile.h gbfile.h session.h src/core/datetime.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ +internal_styles.o: internal_styles.cc defs.h config.h \ -+ cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h -interpolate.o: interpolate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ +interpolate.o: interpolate.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h filterdefs.h filter.h interpolate.h grtcirc.h --itracku.o: itracku.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+itracku.o: itracku.cc defs.h config.h cet.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h interpolate.h filter.h grtcirc.h \ + src/core/logging.h +-itracku.o: itracku.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++itracku.o: itracku.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ gbser.h jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ jeeps/gpsserial.h jeeps/gpsusbint.h jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \ -- config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h \ -+ config.h cet.h inifile.h gbfile.h defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \ -- config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h \ -+ config.h cet.h inifile.h gbfile.h defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ -- config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h \ -+ config.h cet.h inifile.h gbfile.h defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ jeeps/gpsusbcommon.h jeeps/gpsusbint.h - jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \ -- jeeps/gps.h jeeps/../defs.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+ jeeps/gps.h jeeps/../defs.h cet.h inifile.h \ - gbfile.h defs.h session.h src/core/datetime.h src/core/optional.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ - jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ - jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \ - jeeps/garminusb.h jeeps/gpsusbcommon.h jeeps/../garmin_device_xml.h + jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \ +- jeeps/../defs.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h \ ++ jeeps/../defs.h formspec.h inifile.h gbfile.h \ + defs.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/garminusb.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpsport.h \ + jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ +@@ -731,95 +725,95 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \ + jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsusbcommon.h \ + jeeps/../garmin_device_xml.h jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsdatum.h jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \ -- config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h \ -+ config.h cet.h inifile.h gbfile.h defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/../gbser.h \ jeeps/gpsserial.h gbser_posix.h jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \ -- config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h \ -+ config.h cet.h inifile.h gbfile.h defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ @@ -450,400 +482,416 @@ index 6f21943..eb0f120 100644 jeeps/gpsusbcommon.h jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/garminusb.h \ - jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h config.h zlib/zlib.h \ -- zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h defs.h session.h \ + jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h config.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ ++ formspec.h inifile.h gbfile.h defs.h session.h \ src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \ jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \ jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsusbint.h jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ -- config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h \ -+ config.h cet.h inifile.h gbfile.h defs.h \ +- config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ config.h formspec.h inifile.h gbfile.h defs.h \ session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ jeeps/gpsusbint.h jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h config.h \ -- zlib/zlib.h zlib/zconf.h cet.h inifile.h gbfile.h defs.h session.h \ -+ cet.h inifile.h gbfile.h defs.h session.h \ - src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \ ++ formspec.h inifile.h gbfile.h defs.h \ + session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h --jogmap.o: jogmap.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+jogmap.o: jogmap.cc defs.h config.h cet.h \ +-jogmap.o: jogmap.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++jogmap.o: jogmap.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h --jtr.o: jtr.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+jtr.o: jtr.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h csv_util.h --kml.o: kml.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+kml.o: kml.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h grtcirc.h \ - src/core/file.h src/core/xmlstreamwriter.h src/core/xmltag.h \ - xmlgeneric.h --lmx.o: lmx.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+lmx.o: lmx.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-jtr.o: jtr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++jtr.o: jtr.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h nmea.h format.h +-kml.o: kml.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++kml.o: kml.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + kml.h format.h src/core/file.h src/core/xmlstreamwriter.h xmlgeneric.h \ + grtcirc.h src/core/logging.h src/core/xmltag.h units.h +-lmx.o: lmx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++lmx.o: lmx.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ xmlgeneric.h -lowranceusr.o: lowranceusr.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+lowranceusr.o: lowranceusr.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h - mac/libusb/darwin.o: mac/libusb/darwin.c config.h mac/libusb/usbi.h \ -@@ -788,294 +782,261 @@ mac/libusb/error.o: mac/libusb/error.c mac/libusb/usb.h \ - mac/libusb/error.h - mac/libusb/usb.o: mac/libusb/usb.c mac/libusb/usbi.h mac/libusb/usb.h \ - mac/libusb/error.h --maggeo.o: maggeo.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+maggeo.o: maggeo.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - csv_util.h magellan.h xmlgeneric.h --magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+magproto.o: magproto.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - explorist_ini.h gbser.h magellan.h --main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+main.o: main.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h \ - csv_util.h filter.h filterdefs.h src/core/file.h \ - src/core/usasciicodec.h --mapasia.o: mapasia.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mapasia.o: mapasia.cc defs.h config.h cet.h \ ++lowranceusr.o: lowranceusr.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h lowranceusr.h format.h src/core/logging.h +-maggeo.o: maggeo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++maggeo.o: maggeo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h magellan.h +-magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++magproto.o: magproto.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h explorist_ini.h format.h gbser.h magellan.h vecs.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ +@@ -831,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ + jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ + jeeps/gpsrqst.h yahoo.h +-main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++main.o: main.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet_util.h csv_util.h filter.h filter_vecs.h arcdist.h bend.h \ + discard.h duplicate.h height.h heightgrid.h interpolate.h nukedata.h \ +@@ -846,191 +840,191 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h +-mapasia.o: mapasia.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mapasia.o: mapasia.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h -mapbar_track.o: mapbar_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+mapbar_track.o: mapbar_track.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ ++mapbar_track.o: mapbar_track.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h --mapfactor.o: mapfactor.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mapfactor.o: mapfactor.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - src/core/file.h src/core/xmlstreamwriter.h --mapsend.o: mapsend.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mapsend.o: mapsend.cc defs.h config.h cet.h \ +-mapfactor.o: mapfactor.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++mapfactor.o: mapfactor.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h src/core/file.h src/core/xmlstreamwriter.h +-mapsend.o: mapsend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mapsend.o: mapsend.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ mapsend.h magellan.h --mapsource.o: mapsource.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mapsource.o: mapsource.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h --mkshort.o: mkshort.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mkshort.o: mkshort.cc defs.h config.h cet.h \ +-mkshort.o: mkshort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mkshort.o: mkshort.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h --mmo.o: mmo.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+mmo.o: mmo.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h --mtk_locus.o: mtk_locus.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mtk_locus.o: mtk_locus.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - gbser.h + cet.h +-mmo.o: mmo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++mmo.o: mmo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-mtk_locus.o: mtk_locus.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++mtk_locus.o: mtk_locus.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h -mtk_logger.o: mtk_logger.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+mtk_logger.o: mtk_logger.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ ++mtk_logger.o: mtk_logger.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h gbser.h --mynav.o: mynav.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+mynav.o: mynav.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --navicache.o: navicache.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+navicache.o: navicache.cc defs.h config.h cet.h \ + mynav.o: mynav.cc src/core/textstream.h src/core/file.h defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h mynav.h format.h +-navicache.o: navicache.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++navicache.o: navicache.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h cet_util.h src/core/file.h +-naviguide.o: naviguide.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++naviguide.o: naviguide.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h jeeps/gpsmath.h jeeps/gpsport.h +-navilink.o: navilink.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++navilink.o: navilink.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h navilink.h +-navitel.o: navitel.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++navitel.o: navitel.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h src/core/file.h --naviguide.o: naviguide.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+naviguide.o: naviguide.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - csv_util.h jeeps/gpsmath.h jeeps/gpsport.h --navilink.o: navilink.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+navilink.o: navilink.cc defs.h config.h cet.h \ + jeeps/gpsmath.h jeeps/gpsport.h +-netstumbler.o: netstumbler.cc cet_util.h defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++netstumbler.o: netstumbler.cc cet_util.h defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h csv_util.h +-nmea.o: nmea.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++nmea.o: nmea.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + nmea.h format.h cet_util.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h \ + src/core/logging.h strptime.h +-nmn4.o: nmn4.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++nmn4.o: nmn4.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - gbser.h jeeps/gpsmath.h jeeps/gpsport.h navilink.h --navitel.o: navitel.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+navitel.o: navitel.cc defs.h config.h cet.h \ + cet_util.h csv_util.h +-nukedata.o: nukedata.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++nukedata.o: nukedata.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h nukedata.h filter.h +-osm.o: osm.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++osm.o: osm.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + osm.h format.h xmlgeneric.h +-ozi.o: ozi.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++ozi.o: ozi.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h jeeps/gpsmath.h jeeps/gpsport.h src/core/textstream.h \ + src/core/file.h +-parse.o: parse.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++parse.o: parse.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h --netstumbler.o: netstumbler.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+netstumbler.o: netstumbler.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h cet_util.h csv_util.h --nmea.o: nmea.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+nmea.o: nmea.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h \ - gbser.h jeeps/gpsmath.h jeeps/gpsport.h src/core/logging.h strptime.h --nmn4.o: nmn4.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+nmn4.o: nmn4.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h \ - csv_util.h --nukedata.o: nukedata.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+nukedata.o: nukedata.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h nukedata.h --osm.o: osm.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+osm.o: osm.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ - xmlgeneric.h --ozi.o: ozi.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+ozi.o: ozi.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h csv_util.h \ - jeeps/gpsmath.h jeeps/gpsport.h src/core/textstream.h src/core/file.h --parse.o: parse.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+parse.o: parse.cc defs.h config.h cet.h \ +-pcx.o: pcx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++pcx.o: pcx.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - jeeps/gpsmath.h jeeps/gpsport.h --pcx.o: pcx.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+pcx.o: pcx.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h cet_util.h \ - csv_util.h garmin_tables.h + cet_util.h csv_util.h garmin_tables.h -pocketfms_bc.o: pocketfms_bc.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+pocketfms_bc.o: pocketfms_bc.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ ++pocketfms_bc.o: pocketfms_bc.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h -pocketfms_fp.o: pocketfms_fp.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+pocketfms_fp.o: pocketfms_fp.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ ++pocketfms_fp.o: pocketfms_fp.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h xmlgeneric.h -pocketfms_wp.o: pocketfms_wp.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+pocketfms_wp.o: pocketfms_wp.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ ++pocketfms_wp.o: pocketfms_wp.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h csv_util.h +-polygon.o: polygon.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++polygon.o: polygon.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + polygon.h filter.h +-position.o: position.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++position.o: position.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h grtcirc.h position.h filter.h + qstarz_bl_1000.o: qstarz_bl_1000.cc qstarz_bl_1000.h defs.h config.h \ +- zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h format.h src/core/logging.h +-radius.o: radius.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++radius.o: radius.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + radius.h filter.h grtcirc.h +-random.o: random.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++random.o: random.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + random.h format.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h +-raymarine.o: raymarine.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++raymarine.o: raymarine.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h csv_util.h --polygon.o: polygon.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+polygon.o: polygon.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h polygon.h --position.o: position.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+position.o: position.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h grtcirc.h position.h --psitrex.o: psitrex.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+psitrex.o: psitrex.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - garmin_tables.h --radius.o: radius.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+radius.o: radius.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h radius.h grtcirc.h --random.o: random.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+random.o: random.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ - jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ - jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h --raymarine.o: raymarine.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+raymarine.o: raymarine.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - csv_util.h -reverse_route.o: reverse_route.cc defs.h config.h zlib/zlib.h \ -- zlib/zconf.h cet.h inifile.h gbfile.h session.h src/core/datetime.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ +reverse_route.o: reverse_route.cc defs.h config.h \ -+ cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h filterdefs.h filter.h reverse_route.h --rgbcolors.o: rgbcolors.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+rgbcolors.o: rgbcolors.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --route.o: route.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+route.o: route.cc defs.h config.h cet.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h reverse_route.h filter.h +-rgbcolors.o: rgbcolors.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++rgbcolors.o: rgbcolors.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-route.o: route.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++route.o: route.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ grtcirc.h --saroute.o: saroute.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+saroute.o: saroute.cc defs.h config.h cet.h \ +-saroute.o: saroute.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++saroute.o: saroute.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ grtcirc.h --sbn.o: sbn.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+sbn.o: sbn.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h navilink.h --sbp.o: sbp.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+sbp.o: sbp.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h navilink.h --session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+session.o: session.cc defs.h config.h cet.h \ +-sbn.o: sbn.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++sbn.o: sbn.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + navilink.h +-sbp.o: sbp.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++sbp.o: sbp.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + navilink.h +-session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++session.o: session.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+shape.o: shape.cc defs.h config.h cet.h \ +-shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++shape.o: shape.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - shapelib/shapefil.h + shape.h format.h shapelib/shapefil.h shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h --skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+skyforce.o: skyforce.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --skytraq.o: skytraq.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+skytraq.o: skytraq.cc defs.h config.h cet.h \ +-skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++skyforce.o: skyforce.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-skytraq.o: skytraq.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++skytraq.o: skytraq.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ gbser.h --smplrout.o: smplrout.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+smplrout.o: smplrout.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h grtcirc.h smplrout.h --sort.o: sort.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+sort.o: sort.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h sort.h - src/core/textstream.o: src/core/textstream.cc src/core/textstream.h \ -- src/core/file.h defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+ src/core/file.h defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-smplrout.o: smplrout.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++smplrout.o: smplrout.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h smplrout.h filter.h grtcirc.h +-sort.o: sort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++sort.o: sort.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + sort.h filter.h +-src/core/textstream.o: src/core/textstream.cc defs.h config.h zlib/zlib.h \ +- zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ ++src/core/textstream.o: src/core/textstream.cc defs.h config.h \ ++ formspec.h inifile.h gbfile.h session.h \ + src/core/datetime.h src/core/optional.h src/core/textstream.h \ + src/core/file.h src/core/usasciicodec.o: src/core/usasciicodec.cc src/core/usasciicodec.h src/core/xmlstreamwriter.o: src/core/xmlstreamwriter.cc \ src/core/xmlstreamwriter.h -stackfilter.o: stackfilter.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+stackfilter.o: stackfilter.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h filterdefs.h filter.h stackfilter.h --stmsdf.o: stmsdf.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+stmsdf.o: stmsdf.cc defs.h config.h cet.h \ ++stackfilter.o: stackfilter.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h stackfilter.h filter.h +-stmsdf.o: stmsdf.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++stmsdf.o: stmsdf.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet_util.h csv_util.h grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h \ src/core/logging.h --stmwpp.o: stmwpp.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+stmwpp.o: stmwpp.cc defs.h config.h cet.h \ +-stmwpp.o: stmwpp.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++stmwpp.o: stmwpp.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - csv_util.h cet_util.h + cet_util.h csv_util.h strptime.o: strptime.c config.h strptime.h --subrip.o: subrip.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+subrip.o: subrip.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --swapdata.o: swapdata.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+swapdata.o: swapdata.cc defs.h config.h cet.h \ +-subrip.o: subrip.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++subrip.o: subrip.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h swapdata.h --tef_xml.o: tef_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+tef_xml.o: tef_xml.cc defs.h config.h cet.h \ + subrip.h format.h src/core/logging.h +-swapdata.o: swapdata.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++swapdata.o: swapdata.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h swapdata.h filter.h +-tef_xml.o: tef_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tef_xml.o: tef_xml.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ xmlgeneric.h --teletype.o: teletype.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+teletype.o: teletype.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --text.o: text.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+text.o: text.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-teletype.o: teletype.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++teletype.o: teletype.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +-text.o: text.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++text.o: text.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h --tiger.o: tiger.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+tiger.o: tiger.cc defs.h config.h cet.h \ +-tiger.o: tiger.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tiger.o: tiger.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet_util.h csv_util.h --tmpro.o: tmpro.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+tmpro.o: tmpro.cc defs.h config.h cet.h \ +-tmpro.o: tmpro.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tmpro.o: tmpro.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet_util.h csv_util.h --tomtom.o: tomtom.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+tomtom.o: tomtom.cc defs.h config.h cet.h \ +-tomtom.o: tomtom.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tomtom.o: tomtom.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --tpg.o: tpg.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+tpg.o: tpg.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-tpg.o: tpg.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tpg.o: tpg.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h --tpo.o: tpo.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+tpo.o: tpo.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-tpo.o: tpo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++tpo.o: tpo.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h -trackfilter.o: trackfilter.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+trackfilter.o: trackfilter.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h filterdefs.h filter.h trackfilter.h grtcirc.h --transform.o: transform.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+transform.o: transform.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h transform.h --unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+unicsv.o: unicsv.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ - jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ ++trackfilter.o: trackfilter.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h trackfilter.h filter.h grtcirc.h +-transform.o: transform.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++transform.o: transform.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h transform.h filter.h +-unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++unicsv.o: unicsv.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + unicsv.h format.h src/core/textstream.h src/core/file.h csv_util.h \ + garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ +@@ -1038,22 +1032,22 @@ unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \ - src/core/logging.h src/core/textstream.h src/core/file.h --units.o: units.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+units.o: units.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --util.o: util.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+util.o: util.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ - src/core/xmltag.h + src/core/logging.h +-units.o: units.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++units.o: units.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + units.h +-util.o: util.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++util.o: util.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + cet.h src/core/logging.h src/core/xmltag.h util_crc.o: util_crc.cc --v900.o: v900.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+v900.o: v900.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h --validate.o: validate.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+validate.o: validate.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - filterdefs.h filter.h validate.h --vcf.o: vcf.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+vcf.o: vcf.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ +-v900.o: v900.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++v900.o: v900.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-validate.o: validate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++validate.o: validate.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h validate.h filter.h +-vcf.o: vcf.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vcf.o: vcf.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ jeeps/gpsmath.h jeeps/gpsport.h --vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+vecs.o: vecs.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h csv_util.h \ - gbversion.h xcsv.h src/core/file.h --vidaone.o: vidaone.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+vidaone.o: vidaone.cc defs.h config.h cet.h \ +-vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vecs.o: vecs.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + vecs.h dg-100.h format.h energympro.h garmin_fit.h geojson.h \ + src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ +@@ -1065,32 +1059,32 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ + jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h \ + gbversion.h src/core/logging.h +-vidaone.o: vidaone.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vidaone.o: vidaone.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --vitosmt.o: vitosmt.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+vitosmt.o: vitosmt.cc defs.h config.h cet.h \ +-vitosmt.o: vitosmt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vitosmt.o: vitosmt.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ grtcirc.h --vitovtt.o: vitovtt.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+vitovtt.o: vitovtt.cc defs.h config.h cet.h \ +-vitovtt.o: vitovtt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vitovtt.o: vitovtt.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h +-vpl.o: vpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++vpl.o: vpl.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h --vpl.o: vpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+vpl.o: vpl.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h --waypt.o: waypt.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+waypt.o: waypt.cc defs.h config.h cet.h \ +-waypt.o: waypt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++waypt.o: waypt.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \ src/core/logging.h --wbt-200.o: wbt-200.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+wbt-200.o: wbt-200.cc defs.h config.h cet.h \ +-wbt-200.o: wbt-200.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++wbt-200.o: wbt-200.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ gbser.h grtcirc.h --wfff_xml.o: wfff_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+wfff_xml.o: wfff_xml.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - xmlgeneric.h +-wfff_xml.o: wfff_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ ++wfff_xml.o: wfff_xml.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h -wintec_tes.o: wintec_tes.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+wintec_tes.o: wintec_tes.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ ++wintec_tes.o: wintec_tes.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ src/core/optional.h --xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+xcsv.o: xcsv.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h csv_util.h \ - garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ +-xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++xcsv.o: xcsv.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ - jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ +@@ -1098,46 +1092,18 @@ xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \ - src/core/file.h src/core/logging.h strptime.h xcsv.h xcsv_tokens.gperf + src/core/logging.h src/core/textstream.h src/core/file.h strptime.h \ + xcsv.h format.h xcsv_tokens.gperf -xmlgeneric.o: xmlgeneric.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ -+xmlgeneric.o: xmlgeneric.cc defs.h config.h \ - cet.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h cet_util.h src/core/file.h xmlgeneric.h --xmltag.o: xmltag.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+xmltag.o: xmltag.cc defs.h config.h cet.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - cet_util.h src/core/xmltag.h --xol.o: xol.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \ -+xol.o: xol.cc defs.h config.h cet.h inifile.h \ - gbfile.h session.h src/core/datetime.h src/core/optional.h \ ++xmlgeneric.o: xmlgeneric.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h xmlgeneric.h src/core/file.h +-xmltag.o: xmltag.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++xmltag.o: xmltag.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ + src/core/xmltag.h +-xol.o: xol.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++xol.o: xol.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h src/core/file.h \ src/core/xmlstreamwriter.h xmlgeneric.h --yahoo.o: yahoo.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \ -+yahoo.o: yahoo.cc defs.h config.h cet.h \ +-yahoo.o: yahoo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ ++yahoo.o: yahoo.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ - xmlgeneric.h + yahoo.h format.h xmlgeneric.h -zlib/adler32.o: zlib/adler32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ - config.h -zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h config.h --zlib/contrib/minizip/ioapi.o: zlib/contrib/minizip/ioapi.c \ -- zlib/contrib/minizip/ioapi.h zlib/zlib.h zlib/zconf.h config.h --zlib/contrib/minizip/zip.o: zlib/contrib/minizip/zip.c zlib/zlib.h \ -- zlib/zconf.h config.h zlib/contrib/minizip/zip.h \ -- zlib/contrib/minizip/ioapi.h zlib/contrib/minizip/crypt.h -zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h config.h \ - zlib/crc32.h -zlib/deflate.o: zlib/deflate.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \ diff --git a/debian/patches/0007-Use-system-shapelib.patch b/debian/patches/0007-Use-system-shapelib.patch index ac385f6e9..43a601b07 100644 --- a/debian/patches/0007-Use-system-shapelib.patch +++ b/debian/patches/0007-Use-system-shapelib.patch @@ -3,16 +3,17 @@ Date: Thu, 30 May 2019 12:10:23 +0200 Subject: Use system shapelib --- - Makefile.in | 7 ++----- - configure.ac | 3 +++ - shape.cc | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) + Makefile.in | 17 ++++++----------- + configure.ac | 3 +++ + shape.cc | 2 +- + shape.h | 2 +- + 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in -index eb0f120..a1bec30 100644 +index be6f7d0..d277644 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -105,8 +105,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ +@@ -104,8 +104,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ # Extra modules in Jeeps that we don't use # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o @@ -21,27 +22,65 @@ index eb0f120..a1bec30 100644 LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \ formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \ -@@ -115,7 +113,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - src/core/textstream.o \ - src/core/usasciicodec.o \ - src/core/xmlstreamwriter.o \ -- $(GARMIN) $(JEEPS) $(SHAPE) $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -903,8 +901,7 @@ sbp.o: sbp.cc defs.h config.h cet.h inifile.h \ - session.o: session.cc defs.h config.h cet.h \ +@@ -507,7 +505,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h \ + ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \ + src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \ + mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \ +- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \ ++ subrip.h unicsv.h src/core/textstream.h xcsv.h \ + garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ + jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ +@@ -532,7 +530,7 @@ garmin.o: garmin.cc defs.h config.h formspec.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h yahoo.h + garmin_device_xml.o: garmin_device_xml.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h \ +@@ -819,7 +817,7 @@ magproto.o: magproto.cc defs.h config.h \ + dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ + globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ + kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ +- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ ++ qstarz_bl_1000.h random.h shape.h subrip.h \ + unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \ + jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ + jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ +@@ -835,7 +833,7 @@ main.o: main.cc defs.h config.h formspec.h \ + garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ +@@ -955,10 +953,7 @@ session.o: session.cc defs.h config.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h - shape.o: shape.cc defs.h config.h cet.h \ -- inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ -- shapelib/shapefil.h -+ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h - shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h - shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h - shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h + shape.o: shape.cc defs.h config.h formspec.h \ + inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ +- shape.h format.h shapelib/shapefil.h +-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h +-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h +-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h ++ shape.h format.h + skyforce.o: skyforce.cc defs.h config.h \ + formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ + src/core/optional.h +@@ -1053,7 +1048,7 @@ vecs.o: vecs.cc defs.h config.h formspec.h \ + src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ + src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ + legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ +- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ ++ random.h shape.h subrip.h unicsv.h \ + src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ + jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ diff --git a/configure.ac b/configure.ac -index ceaefd3..1fb4a91 100644 +index cdfe3f9..96316d4 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,9 @@ AC_ARG_ENABLE([shapefile], @@ -55,15 +94,28 @@ index ceaefd3..1fb4a91 100644 AC_MSG_RESULT([$enable_shapefile]) diff --git a/shape.cc b/shape.cc -index bdc2961..fce500b 100644 +index 933eb95..6295599 100644 --- a/shape.cc +++ b/shape.cc -@@ -25,7 +25,7 @@ - #include +@@ -32,7 +32,7 @@ #include "defs.h" + #include "shape.h" -#include "shapelib/shapefil.h" +#include - #include + + + #if SHAPELIB_ENABLED +diff --git a/shape.h b/shape.h +index 0ce05af..aa3a0bf 100644 +--- a/shape.h ++++ b/shape.h +@@ -27,7 +27,7 @@ + + #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file + #include "format.h" // for Format +-#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle ++#include // for DBFHandle, SHPAPI_CALL, SHPHandle + #if SHAPELIB_ENABLED diff --git a/debian/patches/0008-Use-usb.h-from-system-include-dir.patch b/debian/patches/0008-Use-usb.h-from-system-include-dir.patch deleted file mode 100644 index 8c052e093..000000000 --- a/debian/patches/0008-Use-usb.h-from-system-include-dir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Jochen Sprickerhof -Date: Thu, 30 May 2019 12:10:47 +0200 -Subject: Use usb.h from system include dir - ---- - Makefile.in | 2 +- - jeeps/gpslibusb.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index a1bec30..f6c341f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -680,7 +680,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ - jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ - jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ - jeeps/gpsusbcommon.h jeeps/gpsusbint.h --jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/usb.h \ -+jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h \ - jeeps/gps.h jeeps/../defs.h cet.h inifile.h \ - gbfile.h defs.h session.h src/core/datetime.h src/core/optional.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ -diff --git a/jeeps/gpslibusb.cc b/jeeps/gpslibusb.cc -index 7017969..3f7ff28 100644 ---- a/jeeps/gpslibusb.cc -+++ b/jeeps/gpslibusb.cc -@@ -31,7 +31,7 @@ - // We use our own (slightly modified) libusb. - # include "mac/libusb/usb.h" - # else --# include "usb.h" -+# include - # endif - #include "gps.h" - #include "garminusb.h" diff --git a/debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch b/debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch deleted file mode 100644 index 839945c9d..000000000 --- a/debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Jochen Sprickerhof -Date: Fri, 26 Jul 2019 10:49:11 +0200 -Subject: Don't pass MAKEFLAGS to $(MAKE) -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -make will pass them automatically. Also they are not meant to be -consumed by make as they are stripped: - -Thus, if you do ‘make -ks’ then MAKEFLAGS gets the value ‘ks’. - -https://www.gnu.org/software/make/manual/html_node/Options_002fRecursion.html ---- - Makefile.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index f6c341f..f376e46 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -382,17 +382,17 @@ rpm: changes.html - tools/mkrpm $(WEB) $(VERSD) $(RELEASE) - - gui: gpsbabel$(EXEEXT) -- cd gui ; $(QMAKE) app.pro && $(MAKE) $(MAKEFLAGS) -+ cd gui ; $(QMAKE) app.pro && $(MAKE) - - linux-gui: gui -- cd gui; $(MAKE) $(MAKEFLAGS) package -+ cd gui; $(MAKE) package - - # Build the Qt front end, place GPSBabel in the right place, deploy all - # the libs. - - mac-gui: gui - rm -f gui/GPSBabelFE.dmg -- cd gui; $(MAKE) $(MAKEFLAGS) package -+ cd gui; $(MAKE) package - mv gui/GPSBabelFE.dmg gui/GPSBabel-$(VERSIOND).dmg - - # release check using CVS tree diff --git a/debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch b/debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch new file mode 100644 index 000000000..196aa3f93 --- /dev/null +++ b/debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch @@ -0,0 +1,21 @@ +From: Jochen Sprickerhof +Date: Thu, 9 Jul 2020 21:59:38 +0200 +Subject: Drop mac/libusb/libusb.h dependency + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index d277644..b43e3d4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -714,7 +714,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \ + jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ + jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \ + jeeps/gpsusbcommon.h jeeps/gpsusbint.h +-jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \ ++jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h \ + jeeps/../defs.h formspec.h inifile.h gbfile.h \ + defs.h session.h src/core/datetime.h src/core/optional.h \ + jeeps/garminusb.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpsport.h \ diff --git a/debian/patches/0010-Fix-manpage-xml.patch b/debian/patches/0010-Fix-manpage-xml.patch deleted file mode 100644 index 8c300cd45..000000000 --- a/debian/patches/0010-Fix-manpage-xml.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof -Date: Tue, 3 Sep 2019 21:06:38 +0200 -Subject: Fix manpage xml - ---- - xmldoc/gpsbabel_man.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xmldoc/gpsbabel_man.xml b/xmldoc/gpsbabel_man.xml -index 621f080..522bc83 100644 ---- a/xmldoc/gpsbabel_man.xml -+++ b/xmldoc/gpsbabel_man.xml -@@ -32,7 +32,7 @@ - Magellan) connected by a serial or USB port. - - -- -+ - By flattening the Tower of Babel that the authors of various programs - for manipulating GPS data have imposed upon us, it returns to us the - ability to freely move our own waypoint data between the programs and diff --git a/debian/patches/0011-Fix-exec-in-gpsbabel.desktop.patch b/debian/patches/0011-Fix-exec-in-gpsbabel.desktop.patch deleted file mode 100644 index 724056bb9..000000000 --- a/debian/patches/0011-Fix-exec-in-gpsbabel.desktop.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Jochen Sprickerhof -Date: Sun, 16 Jun 2019 16:09:18 +0200 -Subject: Fix exec in gpsbabel.desktop - ---- - gui/gpsbabel.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gui/gpsbabel.desktop b/gui/gpsbabel.desktop -index 4ae4525..fe956c2 100644 ---- a/gui/gpsbabel.desktop -+++ b/gui/gpsbabel.desktop -@@ -4,6 +4,6 @@ Name=GPSBabel - Comment=Qt GUI interface for GPSBabel - GenericName=GPSBabel - Icon=gpsbabel --Exec=gpsbabelfe-bin -+Exec=gpsbabelfe - Terminal=false - Categories=Geography;Education;Utility; diff --git a/debian/patches/0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch b/debian/patches/0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch deleted file mode 100644 index bf930d8ed..000000000 --- a/debian/patches/0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Tim Connors -Date: Sat, 14 Sep 2019 22:06:06 +1000 -Subject: The lezyne "super gps", every 10th ride or so, - outputs a .fit file that is entirely valid other than a weird non 0/1 endian - field. Don't dump the data just because of that. - ---- - garmin_fit.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/garmin_fit.cc b/garmin_fit.cc -index ad949f4..8f2b8e1 100644 ---- a/garmin_fit.cc -+++ b/garmin_fit.cc -@@ -253,7 +253,7 @@ fit_parse_definition_message(uint8_t header) - // second byte is endianness - def->endian = fit_getuint8(); - if (def->endian > 1) { -- fatal(MYNAME ": Bad endian field\n"); -+ warning(MYNAME ": Unusual endian field (interpreting as big endian): %d\n",def->endian); - } - fit_data.endian = def->endian; - diff --git a/debian/patches/0014-Use-strncmp-to-compare-array-to-string.patch b/debian/patches/0014-Use-strncmp-to-compare-array-to-string.patch deleted file mode 100644 index 76e55493c..000000000 --- a/debian/patches/0014-Use-strncmp-to-compare-array-to-string.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Jochen Sprickerhof -Date: Tue, 21 Apr 2020 19:28:49 +0200 -Subject: Use strncmp to compare array to string - ---- - v900.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/v900.cc b/v900.cc -index 775b963..91c233b 100644 ---- a/v900.cc -+++ b/v900.cc -@@ -328,11 +328,11 @@ v900_read() - wpt->pdop = atof(line.adv.pdop); - - /* handle fix mode (2d, 3d, etc.) */ -- if (!strcmp(line.adv.valid,"DGPS")) { -+ if (!strncmp(line.adv.valid,"DGPS", sizeof line.adv.valid)) { - wpt->fix = fix_dgps; -- } else if (!strcmp(line.adv.fixmode,"3D")) { -+ } else if (!strncmp(line.adv.fixmode,"3D", sizeof line.adv.fixmode)) { - wpt->fix = fix_3d; -- } else if (!strcmp(line.adv.fixmode,"2D")) { -+ } else if (!strncmp(line.adv.fixmode,"2D", sizeof line.adv.fixmode)) { - wpt->fix = fix_2d; - } else - /* possible values: fix_unknown,fix_none,fix_2d,fix_3d,fix_dgps,fix_pps */ diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch index a0ae1f6aa..010e5a2fe 100644 --- a/debian/patches/cross.patch +++ b/debian/patches/cross.patch @@ -1,6 +1,6 @@ --- gpsbabel-1.6.0+ds.orig/configure.ac +++ gpsbabel-1.6.0+ds/configure.ac -@@ -364,7 +364,8 @@ +@@ -304,7 +304,8 @@ [AC_MSG_RESULT(rpath required)], [AC_MSG_FAILURE(loader cannot find Qt library) LDFLAGS="$OLDFLAGS"] diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version index 59affa106..80471a965 100644 --- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version +++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version @@ -47,7 +47,7 @@ Disable check for newer versions on start. ignoreVersionMismatch_(true), --- a/gui/mainwinui.ui +++ b/gui/mainwinui.ui -@@ -637,7 +637,6 @@ +@@ -691,7 +691,6 @@ @@ -55,7 +55,7 @@ Disable check for newer versions on start. -@@ -666,11 +665,6 @@ +@@ -720,11 +719,6 @@ Preferences... @@ -77,7 +77,7 @@ Disable check for newer versions on start. connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)), -@@ -234,19 +233,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) +@@ -231,19 +230,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) //--- Restore from registry restoreSettings(); @@ -97,7 +97,7 @@ Disable check for newer versions on start. } //------------------------------------------------------------------------ -@@ -1072,10 +1059,6 @@ void MainWindow::applyActionX() +@@ -1068,10 +1055,6 @@ void MainWindow::applyActionX() //------------------------------------------------------------------------ void MainWindow::closeActionX() { diff --git a/debian/patches/htmldoc-location b/debian/patches/htmldoc-location index 0bdf6fccc..ea07cbd03 100644 --- a/debian/patches/htmldoc-location +++ b/debian/patches/htmldoc-location @@ -1,19 +1,40 @@ --- a/gbversion.h.in +++ b/gbversion.h.in -@@ -5,4 +5,4 @@ - * Isn't simplification via automation grand? - */ +@@ -13,5 +13,5 @@ + #define VER_PRODUCT_STR "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@" + #else #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@" --#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-@DOCVERSION@" +-#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-@DOCVERSION@" +#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/gpsbabel.html" + #endif +--- a/testo.d/serialization.test ++++ b/testo.d/serialization.test +@@ -7,7 +7,7 @@ + # the GUI and the document. + # We do a compare_nole as specific whitespace is part of deserialization. + gpsbabel -^3 > ${TMPDIR}/format3.txt +-sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt ++sed 's,file:///usr/share/doc/gpsbabel/gpsbabel.html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt + compare_nole ${REFERENCE}/format3.txt ${TMPDIR}/format3.fiddled.txt + gpsbabel -^2 > ${TMPDIR}/format2.txt + compare_nole ${REFERENCE}/format2.txt ${TMPDIR}/format2.txt +@@ -16,7 +16,7 @@ compare_nole ${REFERENCE}/format1.txt ${TMPDIR}/format1.txt + gpsbabel -^0 > ${TMPDIR}/format0.txt + compare_nole ${REFERENCE}/format0.txt ${TMPDIR}/format0.txt + gpsbabel -%1 > ${TMPDIR}/filter1.txt +-sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt ++sed 's,file:///usr/share/doc/gpsbabel/gpsbabel.html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt + compare_nole ${REFERENCE}/filter1.txt ${TMPDIR}/filter1.fiddled.txt + gpsbabel -%0 > ${TMPDIR}/filter0.txt + compare_nole ${REFERENCE}/filter0.txt ${TMPDIR}/filter0.txt --- a/xmldoc/gpsbabel_man.xml +++ b/xmldoc/gpsbabel_man.xml -@@ -79,7 +79,7 @@ or as the backend for other tools. - Display help that is more exhaustive than this page. If format is given, provide help for only that format. - - --Lists of filters and formats are given in the doc at http://www.gpsbabel.org. -+Lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/. - - - See Also +@@ -118,7 +118,7 @@ or as the backend for other tools. + + + +- Lists of filters and formats are given in the doc at https://www.gpsbabel.org. ++ Lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/. + + + See Also diff --git a/debian/patches/series b/debian/patches/series index abe2e67a3..9eeb150ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,11 +4,6 @@ gpsbabelfe_do-not-check-for-newer-version htmldoc-location 0006-Use-system-zlib.patch 0007-Use-system-shapelib.patch -0008-Use-usb.h-from-system-include-dir.patch -0011-Fix-exec-in-gpsbabel.desktop.patch -0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch -0010-Fix-manpage-xml.patch cross.patch -0012-The-lezyne-super-gps-every-10th-ride-or-so-outputs-a.patch gmapbase.html-location -0014-Use-strncmp-to-compare-array-to-string.patch +0009-Drop-mac-libusb-libusb.h-dependency.patch -- 2.30.2